merge with xen-unstable.hg (staging)
authorAlex Williamson <alex.williamson@hp.com>
Fri, 14 Dec 2007 17:12:40 +0000 (10:12 -0700)
committerAlex Williamson <alex.williamson@hp.com>
Fri, 14 Dec 2007 17:12:40 +0000 (10:12 -0700)

Trivial merge